projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
22f9562
)
Fix a mis-merge
author
Matthias Clasen
<mclasen@redhat.com>
Wed, 20 Dec 2017 15:36:25 +0000
(10:36 -0500)
committer
Matthias Clasen
<mclasen@redhat.com>
Wed, 20 Dec 2017 15:36:25 +0000
(10:36 -0500)
gtk/gtkcssstylepropertyimpl.c
patch
|
blob
|
history
diff --git
a/gtk/gtkcssstylepropertyimpl.c
b/gtk/gtkcssstylepropertyimpl.c
index 65c27d8ca5da8b1dc471fd15fe23e01d081072da..6eb8d8d93f17fcbd0c32b9522de87dfdb0c4938c 100644
(file)
--- a/
gtk/gtkcssstylepropertyimpl.c
+++ b/
gtk/gtkcssstylepropertyimpl.c
@@
-663,6
+663,7
@@
parse_font_feature_settings (GtkCssStyleProperty *property,
return gtk_css_font_features_value_parse (parser);
}
+static GtkCssValue *
box_shadow_value_parse (GtkCssStyleProperty *property,
GtkCssParser *parser)
{